@@ -9,8 +9,9 @@ from django_logit import logit  | 
            ||
| 9 | 9 | 
                from django_response import response  | 
            
| 10 | 10 | 
                from paginator import pagination  | 
            
| 11 | 11 | 
                 | 
            
| 12 | 
                +from account.models import UserInfo  | 
            |
| 12 | 13 | 
                from mch.models import AdministratorInfo, ModelInfo, ModelCameraBodyInfo  | 
            
| 13 | 
                -from utils.error.errno_utils import AdministratorStatusCode, ProductModelStatusCode  | 
            |
| 14 | 
                +from utils.error.errno_utils import AdministratorStatusCode, ProductModelStatusCode, UserStatusCode  | 
            |
| 14 | 15 | 
                 | 
            
| 15 | 16 | 
                 | 
            
| 16 | 17 | 
                @logit  | 
            
                @@ -158,6 +159,25 @@ def model_list(request):  | 
            ||
| 158 | 159 | 
                'left': left,  | 
            
| 159 | 160 | 
                })  | 
            
| 160 | 161 | 
                 | 
            
| 162 | 
                +@logit  | 
            |
| 163 | 
                +def model_name_list(request):  | 
            |
| 164 | 
                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
               | 
            |
| 165 | 
                +    user_id = request.POST.get('user_id', '')
               | 
            |
| 166 | 
                +  | 
            |
| 167 | 
                + # 校验用户是否存在  | 
            |
| 168 | 
                + try:  | 
            |
| 169 | 
                + user = UserInfo.objects.get(user_id=user_id)  | 
            |
| 170 | 
                + except UserInfo.DoesNotExist:  | 
            |
| 171 | 
                + return response(UserStatusCode.USER_NOT_FOUND)  | 
            |
| 172 | 
                +  | 
            |
| 173 | 
                +    models = ModelCameraBodyInfo.objects.filter(brand_id=brand_id, status=True).order_by('-is_important', 'model_name').values_list('model_name', flat=True)
               | 
            |
| 174 | 
                +  | 
            |
| 175 | 
                + models = list(models)  | 
            |
| 176 | 
                +  | 
            |
| 177 | 
                +    return response(200, 'Get Model Name List Success', u'获取型号列表成功', {
               | 
            |
| 178 | 
                + 'models': sorted(set(models),key=models.index)  | 
            |
| 179 | 
                + })  | 
            |
| 180 | 
                +  | 
            |
| 161 | 181 | 
                 | 
            
| 162 | 182 | 
                @logit  | 
            
| 163 | 183 | 
                def model_cameras(request):  | 
            
                @@ -259,6 +259,7 @@ urlpatterns += [  | 
            ||
| 259 | 259 | 
                url(r'^model/delete$', model_views.model_delete, name='model_delete'),  | 
            
| 260 | 260 | 
                url(r'^model/update$', model_views.model_update, name='model_update'),  | 
            
| 261 | 261 | 
                url(r'^model/list$', model_views.model_list, name='model_list'),  | 
            
| 262 | 
                + url(r'^model/name/list$', model_views.model_name_list, name='model_name_list'),  | 
            |
| 262 | 263 | 
                url(r'^model/cameras$', model_views.model_cameras, name='model_cameras'),  | 
            
| 263 | 264 | 
                ]  | 
            
| 264 | 265 | 
                 |